Clean up swiotlb_init() decls.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c b/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c
index 8986ab8dfb5eeb30467e189c985c6119c46107d1..e493e345c54d237967a6e32df9a1c0e3a762a85c 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c
@@ -27,11 +27,8 @@
 #include <asm/uaccess.h>
 #include <xen/interface/memory.h>
 
-#if defined(CONFIG_SWIOTLB)
-extern void swiotlb_init(void);
 int swiotlb;
 EXPORT_SYMBOL(swiotlb);
-#endif
 
 #define OFFSET(val,align) ((unsigned long)((val) & ( (align) - 1)))
 

diff --git a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
index b1f96da92c2a893e0a28e2f6d35a520dec94a280..0d09c4edbf17847bc5367f22e7ef05c44a5cc6a1 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
@@ -58,10 +58,6 @@ EXPORT_SYMBOL(dma_ops);
 
 extern unsigned long *contiguous_bitmap;
 
-#if defined(CONFIG_SWIOTLB)
-extern void swiotlb_init(void);
-#endif
-
 static unsigned long dma_reserve __initdata;
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h
index b38e56f1f5668b0eb192474dcf8d8ae39c747d0a..74a0c21bbecfe61793e0ffc7ec067239f5e97879 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h
@@ -32,6 +32,7 @@ extern dma_addr_t swiotlb_map_page(struct device *hwdev, struct page *page,
 extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address,
                                size_t size, enum dma_data_direction direction);
 extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
+extern void swiotlb_init(void);
 
 #ifdef CONFIG_SWIOTLB
 extern int swiotlb;